gdk: Do end_implicit_paint copy with Cairo
authorBenjamin Otte <otte@redhat.com>
Mon, 19 Jul 2010 21:49:09 +0000 (23:49 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 10 Aug 2010 19:02:28 +0000 (21:02 +0200)
gdk/gdkwindow.c

index 759886e82f9a1996765f14e00e34beda1f7f48e9..da10253fdb8d30ca34a50d1e1b023318640f3007 100644 (file)
@@ -3135,17 +3135,21 @@ gdk_window_end_paint (GdkWindow *window)
 
   if (!paint->uses_implicit)
     {
+      cairo_t *cr;
+
       gdk_window_flush_outstanding_moves (window);
 
       full_clip = cairo_region_copy (private->clip_region_with_children);
       cairo_region_intersect (full_clip, paint->region);
-      _gdk_gc_set_clip_region_internal (tmp_gc, full_clip, TRUE); /* Takes ownership of full_clip */
-      gdk_gc_set_clip_origin (tmp_gc, - x_offset, - y_offset);
-      gdk_draw_drawable (private->impl, tmp_gc, paint->pixmap,
-                        clip_box.x - paint->x_offset,
-                        clip_box.y - paint->y_offset,
-                        clip_box.x - x_offset, clip_box.y - y_offset,
-                        clip_box.width, clip_box.height);
+
+      cr = gdk_cairo_create (private->impl);
+      gdk_cairo_set_source_pixmap (cr, paint->pixmap, 0, 0);
+      cairo_translate (cr, - x_offset, - y_offset);
+      gdk_cairo_region (cr, full_clip);
+      cairo_fill (cr);
+
+      cairo_destroy (cr);
+      cairo_region_destroy (full_clip);
     }
 
   if (private->redirect)